Generic name to object #38686
Merged
Generic name to object #38686
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
KorGgenT
added a commit
that referenced
this pull request
Mar 15, 2020
* Make carried vehicle cargo available for inventory * Update migration.json de-duplicate lines 1002-1057 * Generic name to object (#38686) * Generic name to object * Name to object * Armor name to object (#38685) * Armor fix looks_like * Name to object, volume to string * Lowered beaver aggression and morale to be more accurate and believable. (#38688) * made vacuum sealing more consistent * Add demon chitin armor * Add d-chitin armor recipes Add armormaking book, remove autolearn from recipes Fix recipe category Add armorsmithing book to mapgen * Fix playtest errors * Add repairing ability to sewing kits * Capitals * Itemgroup description fix * Linting * Forgot gauntlet recipe + adjust crafting times * Fix fire protection being too low * Add dog & horse d-chitin armors * Update data/mods/Magiclysm/items/recipe_books.json Co-authored-by: jkraybill <jeremy@dashcord.com> Co-authored-by: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com> Co-authored-by: tenmillimaster <> Co-authored-by: snipercup <50166150+snipercup@users.noreply.github.com> Co-authored-by: chrimchim <58823248+chrimchim@users.noreply.github.com> Co-authored-by: Curtis Merrill <curtis.r.merrill@gmail.com>
ZhilkinSerg
added a commit
that referenced
this pull request
Mar 15, 2020
* Make carried vehicle cargo available for inventory * Update migration.json de-duplicate lines 1002-1057 * Generic name to object (#38686) * Generic name to object * Name to object * Armor name to object (#38685) * Armor fix looks_like * Name to object, volume to string * Lowered beaver aggression and morale to be more accurate and believable. (#38688) * made vacuum sealing more consistent * Add demon chitin armor * Add d-chitin armor recipes Add armormaking book, remove autolearn from recipes Fix recipe category Add armorsmithing book to mapgen * Fix playtest errors * Add repairing ability to sewing kits * Capitals * Itemgroup description fix * Linting * Forgot gauntlet recipe + adjust crafting times * Fix fire protection being too low * Add dog & horse d-chitin armors * Update data/mods/Magiclysm/items/recipe_books.json Co-authored-by: jkraybill <jeremy@dashcord.com> Co-authored-by: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com> Co-authored-by: tenmillimaster <> Co-authored-by: snipercup <50166150+snipercup@users.noreply.github.com> Co-authored-by: chrimchim <58823248+chrimchim@users.noreply.github.com> Co-authored-by: Curtis Merrill <curtis.r.merrill@gmail.com>
ZhilkinSerg
added a commit
that referenced
this pull request
Mar 15, 2020
* Make carried vehicle cargo available for inventory * Update migration.json de-duplicate lines 1002-1057 * Generic name to object (#38686) * Generic name to object * Name to object * Armor name to object (#38685) * Armor fix looks_like * Name to object, volume to string * Lowered beaver aggression and morale to be more accurate and believable. (#38688) * made vacuum sealing more consistent * Add demon chitin armor * Add d-chitin armor recipes Add armormaking book, remove autolearn from recipes Fix recipe category Add armorsmithing book to mapgen * Fix playtest errors * Add repairing ability to sewing kits * Capitals * Itemgroup description fix * Linting * Forgot gauntlet recipe + adjust crafting times * Fix fire protection being too low * Add dog & horse d-chitin armors * Update data/mods/Magiclysm/items/recipe_books.json Co-authored-by: jkraybill <jeremy@dashcord.com> Co-authored-by: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com> Co-authored-by: tenmillimaster <> Co-authored-by: snipercup <50166150+snipercup@users.noreply.github.com> Co-authored-by: chrimchim <58823248+chrimchim@users.noreply.github.com> Co-authored-by: Curtis Merrill <curtis.r.merrill@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
SUMMARY: nonePurpose of change
Contributes to #36110 and #36611
Describe the solution
Change name to object
Describe alternatives you've considered
Not changing
Testing